From 1007f4f3d6ff36aaaf1d331f2dc1d755f60d900a Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Fri, 6 Jul 2012 13:49:23 -0700 Subject: [PATCH] * xfont.c (compare_font_names): Redo to omit the need for casts. --- src/ChangeLog | 4 ++++ src/xfont.c | 5 +++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index 08cb7e9e86a..fb987d5e147 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,7 @@ +2012-07-06 Paul Eggert + + * xfont.c (compare_font_names): Redo to omit the need for casts. + 2012-07-06 Andreas Schwab * xfns.c (Fx_change_window_property): Doc fix. diff --git a/src/xfont.c b/src/xfont.c index cc06e27fe02..b7a1e06199e 100644 --- a/src/xfont.c +++ b/src/xfont.c @@ -164,8 +164,9 @@ xfont_get_cache (FRAME_PTR f) static int compare_font_names (const void *name1, const void *name2) { - return xstrcasecmp (*(const char **) name1, - *(const char **) name2); + char *const *n1 = name1; + char *const *n2 = name2; + return xstrcasecmp (*n1, *n2); } /* Decode XLFD as iso-8859-1 into OUTPUT, and return the byte length -- 2.30.2